Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes sending the default topologyOptions to the /api #3189

Merged
merged 1 commit into from
May 28, 2018
Merged

Fixes sending the default topologyOptions to the /api #3189

merged 1 commit into from
May 28, 2018
+2 −1

Conversation

foot
Copy link
Contributor

@foot foot commented May 24, 2018 •
edited
Loading

  • Which fails sometimes as we overwrite them whatever we find in the
    url state. Url state is not complete anymore so this doesn't work

Test with:

cd $WEAVE/scope/client
mkdir tmp
yarn bundle
cd $WEAVE/service-ui/client
yarn add $WEAVE/scope/client/tmp/weave-scope.tgz
SERVICE_HOST=frontend.dev.weave.works yarn start

@foot foot requested a review from fbarl May 24, 2018 16:09
@rade
Copy link
Member

rade commented May 25, 2018

Is this a better fix to #1999 than #3165?

fbarl
fbarl reviewed May 28, 2018
View reviewed changes
client/app/scripts/reducers/root.js Outdated
@@ -688,7 +688,7 @@ export function rootReducer(state = initialState, action) {
pinnedMetricType: action.state.pinnedMetricType,
});
if (action.state.topologyOptions) {
state = state.set('topologyOptions', fromJS(action.state.topologyOptions));
state = state.mergeDeep(fromJS({ topologyOptions: action.state.topologyOptions }));

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@foot
Fixes sending the default topologyOptions to the /api
1353eb5 
- Which fails sometimes as we overwrite them whatever we find in the
  url state. Url state is not complete anymore so this doesn't work
@foot foot force-pushed the fix-defaults-in-the-ui branch from a424a5a to 1353eb5 Compare May 28, 2018 12:30
@foot foot merged commit 9d63432 into master May 28, 2018
@foot foot deleted the fix-defaults-in-the-ui branch May 28, 2018 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fbarl fbarl fbarl left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@foot @rade @fbarl